Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 21 Jan 2010 22:03:46 +0000 (22:03 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 21 Jan 2010 22:03:46 +0000 (22:03 +0000)

Trivial merge